Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 13 Jun 2010 22:57:55 +0000 (22:57 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 13 Jun 2010 22:57:55 +0000 (22:57 +0000)
commit1dd73dbd7714fe2f24fc07c0fc2784fad60b76c2
tree2f7b6dbb02e000dff59708d89e78c96e10431644
parentd2bda711e9ce96063fdbd90121399605f602947d
parent47040cfe2c73b7f7a7001a0bd7bb611879d0fd4e
Merge from mainline.